From 20cd16c058006d8accbbbe1dc02b2acd0a64e5dc Mon Sep 17 00:00:00 2001 From: "mjw@wray-m-3.hpl.hp.com" Date: Thu, 22 Jul 2004 14:07:08 +0000 Subject: [PATCH] bitkeeper revision 1.1108.1.10 (40ffca0cD1Dy4C5W0JRW9WjeIXOWPA) Catch getopt errors. --- tools/python/xen/xm/opts.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/python/xen/xm/opts.py b/tools/python/xen/xm/opts.py index d66d30a7a3..4523775b65 100644 --- a/tools/python/xen/xm/opts.py +++ b/tools/python/xen/xm/opts.py @@ -1,7 +1,7 @@ # Copyright (C) 2004 Mike Wray """Object-oriented command-line option support. """ -from getopt import getopt +from getopt import getopt, GetoptError import os import os.path import sys @@ -273,7 +273,10 @@ class Opts: return remaining arguments """ self.argv = argv - (vals, args) = getopt(argv[1:], self.short_opts(), self.long_opts()) + try: + (vals, args) = getopt(argv[1:], self.short_opts(), self.long_opts()) + except GetoptError, err: + self.err(str(err)) self.args = args for (k, v) in vals: for opt in self.options: @@ -331,7 +334,7 @@ class Opts: else: p = self.vals.defaults if os.path.exists(p): - print 'Using config file %s\n' % (p) + self.info('Using config file %s' % p) self.load(p, help) break else: -- 2.30.2